Reformatted code

Reformatted code so alignment is better and more on github