Applied review comments from jacalvo