cleaned/commited code in types folder