Merge pull request #18 from pedrofvteixeira/core-refactor

[CLEANUP] as per comments left in https://github.com/webdetails/cpf/comm...