Formatting and lint fixes