[#68] Code Refactored

...