Split out functions in huge class