Cleaned up style a bit.