pylint cleaning

@itnihao, take a look at these changes, all minor stuff, but you
left in a lot of whitespace and just need to clean up some formatting
a bit. Also, take a look at the jenkins server after your code is
merged, this will help you see the errors better and help you improve
your python skill.
Thanks again for the code! We are all learning all the time on how to
write better and cleaner code :)