Simplified formatting. Updated interfaces.