[cleanup] Code cleanup (Raw types, empty string concat)