clean, remove debug code, indent