Little bit more cleanup.
Cleanup.
Factor out frame signal out into separate module.