Reformatting and Fixes