Draft Issue #16 - removing self from function parameters