Remove void

This pull request is on top of #8 (that one should be merged first)