Code cleanup, it makes my eyes bleed