replaced c-style casts with c++ style for units