fix variables declarations