Further cleanup, more polite strict declaration