Code refactoring and Visual changes.