More code cleanup and optimization. 
Added a util function to easily find things in data members.