Add division
Remove unnecessary conditionals