Fixed repetition fragment.
More cleanup, reformated all.