Reformatting and making it shorter