Merged more if statements, no point in making duplicate checks of the same thing...