Merge pull request #131 from tarrsalah/master

Small refactoring, making the code easier to read.