Made some adjustments so it matches ruby convention