cosmetics: reduce and cleanup
fix pause & resume