Cleaned up code. Removed commented-out junk