Comments and one cleanup