Some more code cleanup and table alignment.