Start to fix code Formatting
Fix more code formatting errors