cleaned up the buildfile a little bit