Small changes to fix warnings
Small formatting changes before big code changes