Setting proper scope on new functions

'Cause we like tidy.