clean code: reorder methods