Ran formatter and cleaned up/added class comments