Adding auto-beautifier
Minor fixes