Refactoring to new ruby syntax
Fixed conlict