Minor refactoring of initial skeleton code.