Update installation instructions and code cleanup