got rid of in-line casts