Update to use non-static methods and properties
Added authorship comment