Cleanup
Syle adjustments