Improved formatting, added unformatter