Basic class edits

clean up spaces and ID