Some cleanup, formatting