moved constatns to sensible places