Minor fixes, code refactoring.