Removing unused "$type" variable and long line split into two