Quick cleanup

Hope it helps! :palm_tree: