Code clean-up and additional comments.