remove unused decorator
neaten up decorator a little bit