Cleaning up build and simplifying targets