Ruby refactoring
Some updates