Small refactoring and cleanup of make files
More cleanup in make