refactor on constant naming and exceptions