Tweak document
Redundant initialization
Cleanup