Change compile flag and clearer to read