Method changed to be const
Useless method removed
Static method changed to be non-static