refactoring - slimming down monolithic files.