Fixed whitespaces; enhanced Makefile