some style stuff, removed the duplicate names and so on.