Cleanup and added todo in the readme