Removed return statemt
Fixed variable shadowing