fmcs cosmetic changes. code clean-up. unit tests