Some cleaner typing