change colors and clean up a bit!