trying to clean up
even more