Code formatting
Massive housecleaning