cleaned the code up a tiny bit