ricardo_murad: refactoring in some entities
minor fix