Address some feedback comments.

Signed-off-by: Josep M. Blanquer <blanquer@rightscale.com>