updated to match ruby conventions