Final

Final edit of variables and comments