Part 5a complete. Additional: clean up singleton variables warning by preceding variables with _underscore.