cleanup

removed map() function, since I changed the way type checking was made