View class modified; commented code removed