Work on small code refactor