Minor method reorder