Cleanup all code for consistency, and clarity.

This was done for clarity, so that's it's easy to understand what's being created. This should be important for any library. If you still feel that way, I'll put it back.