Code cleanup....