Re #4 - code style