Corrected formatting and the other improvments mentioned