refactoring decorators

Signed-off-by: Richard Bagshaw <richard@bagshaw.co.uk>