get rid of unnecessary cast
fix indent
Merge branch 'develop'