A quick fix and removing commented out code.