Remove dead comment
Orginize methods and code.