Fix Version number and clean code