Fixed comments and cleaned up code in index to remove tests