refactor, design tweaks, optimizations
optimize