Documentation and cleanup!!