cleaning up a lil, "fixed" 5th case