renamed, cleaned up init