Add comments
Use constant instead of hardcoded value