Cleaning up the mess I made

Don't ask me why I wrote it the most convoluted way possible...