cleanup
cleanup; performance improvements
major overhaul!