Reformatted code and deleted obsolete comments