Refactored all point references to activity references
Merge pull request #12 from NolanChan/CYB-71

Refactored all point references to activity references