cleaning up style a bit