Refactoring for readability.
Remove dead code.