user: minor refactor in if statement and function return
user: minor refactor in if statement and function return

tsuru/gandalf,marcelometal/gandalf,gleez/gandalf,flaviamissi/gandalf,tsuru/gandalf,flaviamissi/gandalf,gleez/gandalf,marcelometal/gandalf,gleez/gandalf,scorphus/gandalf,scorphus/gandalf,marcelometal/gandalf