Update comments
Small refactor