Removed some commented out code for cleaning up. Look into history if you need it ...