Cleanup, and reorder install script