Fix minor issues. Mostly formatting and whitespace