Slight style changes, one new function
Pre cargo conversion