Programming report done
Code cleanup and comments