Cleaned up the version handling code