code review
renames and reshuffling methods