19, cleaned up