code cleanup
startup time tuning