move constants into before block