Moved comments to inside functions