whitespace updates and slight fixes for warnings and initializers