Vertical align + clean bad indentation