Code+Javadoc Cleanup (Window.java)