Revise comments and refactor names