Fixing some formatting issues