style, fail early, remove outdated comment