Cleaned up the poop in the code... :D