Added comment.
Style and bugfix.
Cleaned context variables.