Ref #14 - Code formatting changes