Updated commentes, white lines & removed trailing whitespaces
Improved performance & class dependencies
Changed function names for readability
Add addLabel function, Improved performance