Maintainance

Replaced code with function reference.