Cleaning up code/small bugs

Moved ClientPage to its own class
Removed unused imports