Refactoring: use safer hash fetch
Add underscores to large numeric literals to improve their readability