Rewrite method for comprehension
Don't use puts in classes

Some of these classes are reused in other apps (e.g. whitehall) and we
don't want random logging to be written to STDOUT.