Added comments / fixed formatting