House cleaning: better comments, formatting etc.