Formatting fixes

Fixed for readability and consistency