Cleaned up the code.
Made it possible to define structs.