Make code nicer to look at
Update version number