Reformatting and reorganizing code.