USER reformated

from nested to separated if statements with returns