#396 - Style enhancements