Remove unecessary comments
Fix data cleaning for nil entries