Code cleanup complete; at least the first phase of it!