Can you move these into more appropriate and idiomatic places?