Refactoring
Change version + minor correction