Add doc, allow changing variable name, change static methods to object methods