Some lazy, sucky, code cleaning and fixing. More suppresses less fixes then normal.