#396 - style enhancements