Purely cosmitic changes

Add some white space and other minor reformatting