GH90 - Code clean