Reformatting, nicer