Standardized function and variable naming convention, cleaned up function comments