Refactored some code (placed to internal)

Changed some text.

Signed-off-by: Neil Guzman <nguzman@redhat.com>