Quick fixup

Feel like an idiot now that I've seen all that can be fixed! :P 

Hope it helps! :palm_tree: