Remove debug
Minor tweak
More minor tweak