Incorporate Aidan's RubyStylee suggestions