cleaning up some conditional logic in the Collector
prefer '.nil?' over '== nil'
lots of small syntax updates and refactors