Moved some literals to Constants class