Tweak constructor comment
Reorganize