More linting and minor refactoring
More linting and minor refactoring

thotmx/roo,fabien-michel/roo,visagio/roo,xchanging-mm4/roo,roo-rb/roo,stevendaniels/roo,maruware/roo,pabloh/roo,RobertRehberg/roo,reshleman/roo