Changed most functions to use more descriptive (and camelCase) names