Remove redundant method
Improvements to commenting