trying to clean it up