diff --git a/media-sound/audacious/audacious-3.9.recipe b/media-sound/audacious/audacious-3.9.recipe
index 40e18660c..9b4919b38 100644
--- a/media-sound/audacious/audacious-3.9.recipe
+++ b/media-sound/audacious/audacious-3.9.recipe
@@ -49,6 +49,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	audacious$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libglib_2.0$secondaryArchSuffix
diff --git a/media-sound/auralillusion/auralillusion-4.0.recipe b/media-sound/auralillusion/auralillusion-4.0.recipe
index d378f3194..13a5d3657 100644
--- a/media-sound/auralillusion/auralillusion-4.0.recipe
+++ b/media-sound/auralillusion/auralillusion-4.0.recipe
@@ -14,7 +14,6 @@ PROVIDES="
 	auralillusion = $portVersion
 	cmd:Ai4 = $portVersion
 "
-
 REQUIRES="
 	haiku
 "
diff --git a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
index e045cc74b..0c20ef273 100644
--- a/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
+++ b/media-sound/gogo_no_coda/gogo_no_coda-3.13.recipe
@@ -4,23 +4,23 @@ Mp3 encoder based on LAME3.88, which is optimized for Enhanced 3D \
 Now!/SSE/SSE2 and dual-CPUs.
 "
 HOMEPAGE="https://github.com/teragonaudio/gogo-no-coda"
+COPYRIGHT="2001-2003 Respective gogo-no-coda creators"
+LICENSE="GNU LGPL v2"
+REVISION="1"
 SOURCE_URI="https://github.com/teragonaudio/gogo-no-coda/archive/82b1c8ccab661df3413c16435a957da393f93fcb.zip"
 CHECKSUM_SHA256="4171bd2c085af61ea2281f0ebd483f93ed9f2808ada321cea48187dbdbb4c447"
 SOURCE_FILENAME="gogo_no_coda-$portVersion.zip"
-LICENSE="GNU LGPL v2"
-COPYRIGHT="2001-2003 Respective gogo-no-coda creators"
-REVISION="1"
+SOURCE_DIR="gogo-no-coda-82b1c8ccab661df3413c16435a957da393f93fcb"
+PATCHES="gogo_no_coda-3.13.patch"
+
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="gogo_no_coda-3.13.patch"
-
 PROVIDES="
 	gogo_enc$secondaryArchSuffix = $portVersion compat >= 1
 	cmd:gogo_enc$secondaryArchSuffix
 	cmd:gogo$secondaryArchSuffix
 	"
-
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
@@ -28,7 +28,6 @@ REQUIRES="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
-
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
@@ -36,8 +35,6 @@ BUILD_PREREQUIRES="
 	cmd:nasm
 	"
 
-SOURCE_DIR="gogo-no-coda-82b1c8ccab661df3413c16435a957da393f93fcb"
-
 BUILD()
 {
 	cd linux
diff --git a/media-sound/qmmp/qmmp-1.2.3.recipe b/media-sound/qmmp/qmmp-1.2.3.recipe
index aabb8ef18..101f5c87f 100644
--- a/media-sound/qmmp/qmmp-1.2.3.recipe
+++ b/media-sound/qmmp/qmmp-1.2.3.recipe
@@ -8,9 +8,6 @@ REVISION="1"
 SOURCE_URI="https://sourceforge.net/projects/qmmp-dev/files/qmmp/qmmp-$portVersion.tar.bz2"
 CHECKSUM_SHA256="32a162b273a61b5d7a568f266d0cc3c3dab63c310d89046280ace42d84ac9816"
 PATCHES="qmmp-$portVersion.patchset"
-ARCHITECTURES="!x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86"
-
 ADDITIONAL_FILES="
 	qmmp.rdef.in
 	BenuAmp.wsz
@@ -18,6 +15,9 @@ ADDITIONAL_FILES="
 	icons.zip
 	"
 
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
 PROVIDES="
 	qmmp$secondaryArchSuffix = $portVersion
 	app:Qmmp$secondaryArchSuffix = $portVersion
@@ -51,6 +51,7 @@ REQUIRES="
 	lib:libvorbis$secondaryArchSuffix
 	lib:libwavpack$secondaryArchSuffix
 	"
+
 PROVIDES_devel="
 	qmmp${secondaryArchSuffix}_devel = $portVersion
 	devel:libqmmp$secondaryArchSuffix = 0.0.0 compat >= 0
@@ -59,6 +60,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	qmmp$secondaryArchSuffix == $portVersion base
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libarchive$secondaryArchSuffix
diff --git a/media-sound/redoflacs/redoflacs-0.30.recipe b/media-sound/redoflacs/redoflacs-0.30.recipe
index f588fb257..6ec43670c 100644
--- a/media-sound/redoflacs/redoflacs-0.30.recipe
+++ b/media-sound/redoflacs/redoflacs-0.30.recipe
@@ -6,8 +6,8 @@ COPYRIGHT="2010-2014 Jaren Stangret"
 LICENSE="GNU GPL v2"
 REVISION="2"
 SOURCE_URI="https://github.com/sirjaren/redoflacs/archive/v$portVersion.tar.gz"
-SOURCE_FILENAME="redoflacs-$portVersion.tar.gz"
 CHECKSUM_SHA256="96e6b92d6211469181da7f065510984423ee4d5a059265ffb7fc38e81ae4de3f"
+SOURCE_FILENAME="redoflacs-$portVersion.tar.gz"
 PATCHES="redoflacs-$portVersion.patchset"
 
 ARCHITECTURES="any"
diff --git a/media-sound/soundpipe/soundpipe-1.7.0.recipe b/media-sound/soundpipe/soundpipe-1.7.0.recipe
index b3863a2c4..2515ba2d5 100644
--- a/media-sound/soundpipe/soundpipe-1.7.0.recipe
+++ b/media-sound/soundpipe/soundpipe-1.7.0.recipe
@@ -22,6 +22,7 @@ REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libsndfile$secondaryArchSuffix