Lite refactoring etc...
Lite refactoring etc...