[bugfix] Refactoring the Fix for #80

This commit refacts the classes and remove unnecessary semi-colons,
Fixing #80 with better code.