Improved formatting
Stats is ugly but they are working