Cleaned up some messy todos