More cleaning up code and changed slider values a bit for color