Changed the formatter and made minor tweaks