More const, less let (ref #4)