Formatting fixes
More reformatting to simplify the code