Making code more "idiomatic"

[egonelbre]

I made a ton of different changes to make the code look "as I would write it". I'm not sure whether you will like all the changes. Basically, consider all changes as suggestions, rather than "this is how it must look".

If you have any questions about some commit, just ask. :)

PS: I made the changes in blind without testing, because I didn't want to make search API keys. So there might be some dragons somewhere.