Removed unrequired test in configure.
Reformatting if statements to a more standard layour