Small Refactor