Small changes and comments
Remove Viewport class (not needed)