Remove commented code and fixed indentations