Applied first round of STLs suggestions