Make file tidy up