Hopefully fixing some formatting issues