cleaning up

Added some short if statements