Minor changes. Undo deleted commented code.