cleaning up build a bit