Minor non-functional changes