Move helper methods closer to usage, don't mix in