Documentation and cleaned up the code a little