Cleaned it up, ready for colors