all kinds of little changes, biggest one is cleaner type