Simple Refactor