Remove unnecessary braces and remove debug