Cleanup and added todo's