Refactored some data types.