Fixed make to call make in ./lib
Reformat of code.