add debug. code cleanup