split enhancements form, minor style changes