Cleanup double code + prepare Semantic Versioning