diff --git a/d2core/d2gui/box.go b/d2core/d2gui/box.go
index 446d5e10..63f42394 100644
--- a/d2core/d2gui/box.go
+++ b/d2core/d2gui/box.go
@@ -74,8 +74,7 @@ func NewBox(
 	renderer d2interface.Renderer,
 	ui *d2ui.UIManager,
 	contentLayout *Layout,
-	width, height int,
-	x, y int,
+	width, height, x, y int,
 	l d2util.LogLevel,
 	title string,
 ) *Box {
diff --git a/d2core/d2gui/layout_scrollbar.go b/d2core/d2gui/layout_scrollbar.go
index 151a2a34..38bf2551 100644
--- a/d2core/d2gui/layout_scrollbar.go
+++ b/d2core/d2gui/layout_scrollbar.go
@@ -64,10 +64,7 @@ const (
 )
 
 // NewLayoutScrollbar attaches a scrollbar to the parentLayout to control the targetLayout
-func NewLayoutScrollbar(
-	parentLayout *Layout,
-	targetLayout *Layout,
-) *LayoutScrollbar {
+func NewLayoutScrollbar(parentLayout, targetLayout *Layout) *LayoutScrollbar {
 	parentW, parentH := parentLayout.GetSize()
 	_, targetH := targetLayout.GetSize()
 	gutterHeight := parentH - (2 * textSliderPartHeight)
diff --git a/d2core/d2map/d2mapentity/factory.go b/d2core/d2map/d2mapentity/factory.go
index 2b400b3f..1e24824d 100644
--- a/d2core/d2map/d2mapentity/factory.go
+++ b/d2core/d2map/d2mapentity/factory.go
@@ -64,7 +64,7 @@ func NewAnimatedEntity(x, y int, animation d2interface.Animation) *AnimatedEntit
 // NewPlayer creates a new player entity and returns a pointer to it.
 func (f *MapEntityFactory) NewPlayer(id, name string, x, y, direction int, heroType d2enum.Hero,
 	stats *d2hero.HeroStatsState, skills map[int]*d2hero.HeroSkill, equipment *d2inventory.CharacterEquipment,
-	leftSkill, rightSkill int, gold int) *Player {
+	leftSkill, rightSkill, gold int) *Player {
 	layerEquipment := &[d2enum.CompositeTypeMax]string{
 		d2enum.CompositeTypeHead:      equipment.Head.GetArmorClass(),
 		d2enum.CompositeTypeTorso:     equipment.Torso.GetArmorClass(),
diff --git a/d2game/d2player/globeWidget.go b/d2game/d2player/globeWidget.go
index f2bccb84..6a8da540 100644
--- a/d2game/d2player/globeWidget.go
+++ b/d2game/d2player/globeWidget.go
@@ -68,7 +68,7 @@ func newGlobeWidget(ui *d2ui.UIManager,
 	asset *d2asset.AssetManager,
 	x, y int,
 	gtype globeType,
-	value *int, valueMax *int,
+	value, valueMax *int,
 	l d2util.LogLevel) *globeWidget {
 	var globe, overlap *globeFrame
 
diff --git a/d2networking/d2netpacket/packet_add_player.go b/d2networking/d2netpacket/packet_add_player.go
index a503a075..795879a6 100644
--- a/d2networking/d2netpacket/packet_add_player.go
+++ b/d2networking/d2netpacket/packet_add_player.go
@@ -35,8 +35,7 @@ func CreateAddPlayerPacket(
 	stats *d2hero.HeroStatsState,
 	skills map[int]*d2hero.HeroSkill,
 	equipment d2inventory.CharacterEquipment,
-	leftSkill, rightSkill int,
-	gold int) (NetPacket, error) {
+	leftSkill, rightSkill, gold int) (NetPacket, error) {
 	addPlayerPacket := AddPlayerPacket{
 		ID:         id,
 		Name:       name,