Tidy up app constants