Some refactoring on effects
Updated makefile