Add shlex to handle in-line comments

Use shlex for better comment handling