Comments and light refactors