Mass refactor
Clean target for makefile