Clean up check_installed() method

See #271, #238