Logging added, camelCase removed.