Fix : Code Cleanup
Add : Report