improvement on code completion feature