Performed a refactor, documentation