Formatting and fixes