Minor typo in uninstall function; moving stuff to include file