Removed an unused variable and shorten a type name too long.