Cleanup: missing public & to many methods