Cleanup

Makes versions easier to write