Continued refactoring, making minor improvements.