spring cleaning, now w more comments