Cleaning up code.

Signed-off-by: Ronald Huereca <ronalfy@gmail.com>