Tweaked build system, made it a little cleaner