Switching/Reformatting a few things