Improve code readability. Closes #9