finalize refactoring for screencast.