Code comment and (little) restyling