Cleanup and build improvements

@elingg PTAL
:thumbsup: clear instructions!