quick refactor and docs update