Applied ruby style guide via RubyMine
Resolved merge conflict