Removed some commented out/unused code to improve clarity.