Reformatted, removed warnings