Wsotwo 92

improve if case to avoid extra nesting