Cleaned Up If Statement