deleting commented code, fixing some comments for functions, indenting also