Made convention-following changes
MINOR profiling changes