some rubocode inspired changes