cleaned up style a little