Cleaned-up raw datatypes with custom types.
Moved constants into separate file.
More cleaning-up and using constants instead of literal characters in the code.