Moved number conversion functionality to dedicated module