Address code arrangement/styling issues raised by Julen