Changed formatting some