Sixth Commit

Tidied up a few things, made the code (and Window) ever-so-slightly
cleaner.