Refactored some items