Documentation and cleaning changes