Change some formatting for consistency