added comments
Updated decorators and imports