Minor refactoring

* Use a List argument to ProcessBuilder
* Fix whitespace issues
* Remove the completed TODO's