Remove superfluous comments and whitespace
Add socksPort arg to parser and basic unit tests