clean up, remove duplicate methods
cleanup, documentation