Assignment 11 clean up
Classpage update