Mostly formatting, some fixes for warnings