minor optimizations
cleanup decorators