Documentation and Code clean up