Some simple refactor