Remove unnecessary returns and debuggers
Fix Conditions
Very minor changes