removed commented code, updated colour