diff --git a/dev-lang/yab/yab-1.7.5.2.recipe b/dev-lang/yab/yab-1.7.5.2.recipe
index 6e0ec8f4d..e72834e55 100644
--- a/dev-lang/yab/yab-1.7.5.2.recipe
+++ b/dev-lang/yab/yab-1.7.5.2.recipe
@@ -1,22 +1,19 @@
 SUMMARY="Extended version of the yabasic programming language"
-DESCRIPTION="
-yab is an extended version of yabasic, a BASIC programming language, with \
-special commands designed for Haiku.
-"
+DESCRIPTION="yab is an extended version of yabasic, a BASIC programming \
+language, with special commands designed for Haiku."
 HOMEPAGE="http://yab.orgfree.com"
-SOURCE_URI="https://github.com/bbjimmy/YAB/archive/1.7.5.2.tar.gz"
-CHECKSUM_SHA256="06922796ea4d981c8d972ec2b890509d818cf0ba1dfe74c094ae4b689ec98208"
-
-REVISION="1"
-LICENSE="Artistic"
-COPYRIGHT="
-	1995-2006 Marc-Oliver Ihm (yabasic)
+COPYRIGHT="1995-2006 Marc-Oliver Ihm (yabasic)
 	2006-2009 Jan Bungeroth (yab improvements)
-	2013-2015 Jim Saxton (yab improvements)
-	"
+	2013-2015 Jim Saxton (yab improvements)"
+LICENSE="Artistic"
+REVISION="2"
+SOURCE_URI="https://github.com/bbjimmy/YAB/archive/$portVersion.tar.gz"
+CHECKSUM_SHA256="06922796ea4d981c8d972ec2b890509d818cf0ba1dfe74c094ae4b689ec98208"
+SOURCE_DIR="YAB-$portVersion"
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
 	yab = $portVersion
 	cmd:yab = $portVersion
@@ -26,6 +23,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	"
@@ -36,7 +34,6 @@ BUILD_PREREQUIRES="
 	cmd:make
 	cmd:mkdepend
 	"
-SOURCE_DIR=YAB-1.7.5.2
 
 BUILD()
 {
diff --git a/haiku-apps/yab_ide/yab_ide-2.2.5.recipe b/haiku-apps/yab_ide/yab_ide-2.2.5.recipe
index 4650b669a..5f238dd4b 100644
--- a/haiku-apps/yab_ide/yab_ide-2.2.5.recipe
+++ b/haiku-apps/yab_ide/yab_ide-2.2.5.recipe
@@ -1,23 +1,21 @@
 SUMMARY="An integrated development environment for yab"
-DESCRIPTION="
-Yab allows fast prototyping with simple and clean code. yab contains a large \
-number of BeAPI specific commands for GUI creation and much, much more.
+DESCRIPTION="Yab allows fast prototyping with simple and clean code. yab \
+contains a large number of BeAPI specific commands for GUI creation and much, \
+much more.
 
 yab wouldn't be complete without the yab-IDE, a powerful development \
-environment, which of course is programmed in yab itself.
-"
+environment, which of course is programmed in yab itself."
 HOMEPAGE="http://yab.orgfree.com"
+COPYRIGHT="2006-2015 Jan Bungeroth"
+LICENSE="Artistic"
+REVISION="3"
 SOURCE_URI="https://github.com/bbjimmy/YAB/archive/1.7.5.2.tar.gz"
 CHECKSUM_SHA256="06922796ea4d981c8d972ec2b890509d818cf0ba1dfe74c094ae4b689ec98208"
-
-REVISION="3"
-LICENSE="Artistic"
-COPYRIGHT="
-	2006-2015 Jan Bungeroth
-	"
+SOURCE_DIR=YAB-1.7.5.2
 
 ARCHITECTURES="x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
 PROVIDES="
 	yab_ide$secondaryArchSuffix = $portVersion
 	app:yab_IDE = $portVersion
@@ -43,7 +41,6 @@ BUILD_PREREQUIRES="
 	cmd:mkdepend
 	cmd:yab
 	"
-SOURCE_DIR=YAB-1.7.5.2
 
 BUILD()
 {