cleaned up configure