Formatting changes and added a makefile