removed possible type conflicts, leverage "plus sign-less" concatenation and removed unused import