Small fixes and Formatting