Small fixes
Fixed
Without mutable variable