cleaned up functions
Merge branch 'master' of https://github.com/MoopsLC/ploc