Fixed broken instanciation
Changed vocabulary
Rewrite for clarity
Coding style
Removed useless method