Efficiency and function name improvements
Merge branch 'develop'