Refactor for better coding standards
Refactor for better coding standards
Auto Formatting of all files