cleaned up a bit and added todo to review