Labeled datatypes and cleaned up

Started labeling data types, next will be to label processes.