cleaned up. ready for ridicule