(cleanup) improve readability and version num