Mangle method names
Fix warnings when no data
Clean up