Fixes and Formatting