Add switch
Fix indentation