Improve sample file parsing and comments