optimizations

slimmed the overall codebase; improved readability within classes