:lipstick: Code Cleanup Per @kevinsawicki's Suggestions