cleaned up sorted and used diff to merge since fork
Add --filename argument, consistent whitespace