indentation and small fix for umount to avoid warnings and correct check