Cleanup code
Change type definition
Update version identification