cleanup according to some sonar warnings

I made a code cleanup as thank you for last very fast version release ;)

http://blog.lgohlke.de/2013/05/opensource-at-its-best.html

the cleanup is made with this sonar profile
http://nemo.sonarsource.org/profiles/export?language=java&name=Dory%2527s%2520profile

Hope you like it!