Refactored Censor class