Added modifier styling
Removed unused code