refactoring contatos

Signed-off-by: Lucas Ferreira <lucasfe@gmail.com>