removed unused use
Removed unneeded underscore
Fixed minor cs issues / redundant conditionals.