code clean up & minor fixes(color arrays)