Code cleanup and maint.