overhauled version, with styleguide tools