Use 'or' instead of 'if' when appropiate

Just some minor changes I saw when reading through.