Code cleanup. Fix (let)s.