Cleaned up bad idea