clean up indentaion and comments