Silly refactoring

Signed-off-by: Paulo Roberto Urio <jimmyskull@gmail.com>