Refactor: avoid hard coding as possible