Massive cleanup and pretty comments