Made type cheaks more clear