Fix style
Remove unnecessary type casting
Remove unnecessary header include
Merge branch 'origin/master'