Organization, better comments, minor stuff