Small refactor + strip trailing whitespace on intro