Minor refactor

rename functions
Refactor to accommodate solutions in Python