ALM-657 cleaned up decorators
ALM-657 fixed typo