A bit of refactoring in Cloud. Also some edits to Guess