Refactored views cleaner.