Code clean-up in generated aspect