Clean and refactor some stuff
Bump version