Cleanup of code

Changed color of items and got rid of some old commented code