more using constants instead of hardcoded values