Fix focus change shortcuts to only cycle through windows in the current workspace
Fix indentation