Code refactor for cleaner design.