Clean up text labels, use move and type constants