Cleanup of paint demo. Yay!