minor changes (change method name and clean unused code)