formatting changes
removed commented code, changed indentations