Fix variables scope; Go strict