Done some formatting