Done some formatting!