Refactors; fixed -=