Added comments/Reformatted some names