tab/spaces and indentation fixes