More cleanup/formatting