altered general style, fixed ruhoh v2.2