Minor fixes & refactoring.