Start working on Patrick's review comments (the easy ones)