Changed some names and removed useless method