#38
Previous code structure removed