Cleaned up visulization code, colorized