Code comments improved