Reformatting and made much neater