Comments and refactors