Use :install and not :upgrade for installing packages + minor cleanup