Update build process

Add Makefile
Fix CS issues