Improve code readability
Merge pull request #23 from unikent/master

Improve code readability