fixed formatting issues and tab-indents