Lite refactoring etc...