ColorExtensions & general code cleaning