Warnings cleanup (with -Weffc++)