Readable type-functions and more concise comments.
Nicer type-functions.