Add justIf & nothingIf and refactor a little bit