Code clean-up in AUTH module