Refactored to ruby naming conventions