Reformatted, fixed bug