Formatting + remove debug lines