Made "if" statement shorter [FINAL COMMIT]