Added comments and cleaned up a little bit