removed unnecessary things and updated color