A bit of restructuring and a lot of comments.