Cleaaned up and reduced repo size