Sorry, i was on vacation. I did organize lines by type, but if you prefer i could reopen this pull and indent as you wan't it. ;)