cleaned up
added todo