Added String and Version extensions, and cleanup