Added comments and moved around some stuff