Update installation instructions and use defer