removed references to static member in favor of free functions
implemented more helpers