Change method name, make elements private, refactor tests