more minor changes due to last code review - improvement of spacing, url cleaning, and minor language updates