Fix warnings
Fix formatting