Fix indent on newline on while in {}-braces caused by smart-indent, some cleanup