Efficiency and function name improvements