Added default viewport
Removed useless comments