Broke out two additional methods for querying. Beginning cleanup w/ rubocop.