All-around style adjustments and refactoring.