Some code refactoring, etc.