Add annotations
Cleanup Unused code
Remove unused parameter
Comment requested