Use constants
Fix dialyzer warnings (: