Refactoring recent changes to use existing blocks of code

There's no need to keep adding if statements when we have more efficient code already