Cleanup and adding some color