Few aesthetic changes to the code.