Remove some warnings, fix some formatting