* Clean code
 * fixes #68
 * closes #68