Work on refactoring Note