javadoc, refactoring
refactoring
refactoring
Fixes #150
private field
moved to view
fixes #149
extends window