Completing the datatype revision. Added more whitespace and comments, just like in the last commit.