making code clearer
fixes #102