Remove debug code
Updates
Styling