Small Refactor to new structure