More 'flojay_' -> 'fj_' changes and some minor formatting.