modified: little style modifications