removed junk and trivially different syles #2
Merge branch 'iss2' #2