Minor code cleanup
Updated read me with TODO’s