queue exercise 3 done, and other style fixes