Style stuff and OSX makefile