implemented / refactored decorators / items

implemented / refactored decorators / items