Made casts clearer