Order class members
Remove extra comment