a little clean up and slight color changes