remove __call__, move get code