Separate out Select helper methods
Cleanup