Added comments and cleaned up a bit