Reformatted, removed silly comments