Added some shorthand and comments.