Strike out code refactor todo