Removing simple_tag decorator for backwards compatibility, some code formatting, updating comments.