Fixed erroneous changes in previous commit which conflicted with project indentation rules