Minor fixes

Updated comments
Removed redundant variables and methods