Formatting and Fixes