Renamed class name and did initial code cleanup

Signed-off-by: Nick Diego Yamane <nick.yamane@openbossa.org>