Small code cleanp to remove all runtime errors

Hope it helps! :palm_tree: