Some cruzeira classes refactored