refactor - remove dead code, extract method
add comment