Cleaned up if-else syntax in build files