2014.xx: following ruby guide lines better