Update comments. Refactor names.