MYG000 133 - Integrating with FE

Clean code and fix lint warnings. 
Include branch 132 and 196