some FP beautification