rename method
cleanup
add accessors #6