clean up style a bit, add warn