Removed postfix from wrapped functions. Cleaned up a little.