Being more pythonic, refactoring

- using else statements in for loops
- proposed by
  http://pyvideo.org/video/1780/transforming-code-into-beautiful-idiomatic-pytho