removed premature optimization