Added comments and cleaned up a few things