More typing/removed some of it