Code styling: apply fixes as per Mark's advice.