Added some info to window title.
Small code organization.
Small cleanup.