Refactor. Code clean-up.