modifying doc strings and cleaning up