cleaned up @todos