Did some formatting fixes