Fixes Formatting issues