Little clean up...