Style improvements
Minor fix
Update tff
Merge branch 'develop'