Refactor - clean up code