code cleanup v2 indent