Removed some uncommented code and make some other small changes to enhance readability.