Few aesthetic changes to code.