GPII-543: Clean code a bit.