Removed unused (and incomplete) code.
Shorter name for auxiliary function.
Shorter name for auxiliary function.