cleaned up init arguments