Code Reformatting and changes