Initial code reveiw changes