Remove hard-coded constants, use Constants

Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>