Removed type hinting and added comments to relieve issues later on