Cleaned up version system