Hints & Makefile refactoring