Small improves in the code