Comments added, debug lines removed