[SQUASHME] Fixing formating issues