hopefully some cleanup