Rearrange functions, removed stuff
Types, formating, typesignatures