Changes....again!

I am trying to clean up my code here!