Cleanup and move into static.