Simplifying things

Signed-off-by: Henrique Vicente <henriquevicente@gmail.com>