Attempting clean up, too many ideas