Add suppress warnings and fix some formatting