Add a bit of documentation, move some things around...

... Avoid waiting directly inside of the condition of an "if". :P