More Formatting bug fixes
Using Formulas exmaple
Code refactoring