make clean
reuctions of code generated for assignemnt
Merge with master