Small changes. Removed some commented code.