Comments and var rename