Reformating code, still working on it