cleanup + consistent constant naming