Disambiguated a few function definitions. Moved whitespace around.