updates to clean it up