Refactored/cleaned Makefile & pre-commit.sh