Reformatting and quick cleanup