Updated the header.
Indent using spaces.
Initialize at the end.
Uses the tag registering added in 4.6.0-dev.