Feature/refactor decorators

Refactored decorators and trimmed unused imports.