Attempting to clean up a pretty nasty mess that I made with the last commit