(Nikita) Optimizing code n renaming few methods