Styling and removing debug code
Styling and removing debug code