Reformated if else construct