Refactor out methods; use JS-style names