Removing unnecessary code & improving readbility

Hi Martin,

Good work putting together this library!

I believe my pull request's title says it all, but if there is anything that is unclear or you don't agree with please let me know.

I tried to make the code a little bit more self-explanatory and easier to read; I hope this is helpful.

Andreas