Cleaned up autoconf