removing commented out code
code formatting according to std