Cleaning up some code

I'm trying to introduce one-line ifs if they make the code more concise