[H000206] Harkin (Fixes #515), [M001183] Manchin (Fixes #494)
fix whitespace issues, shortened options
Merge pull request #566 from makecakenotwar97/master

[H000206] Harkin (Fixes #515), [M001183] Manchin (Fixes #494)