Refs #17 - Alignment, spacing, coding conventions.