Cleaner version checking

Cleaning  #4