minor cleanup of init