Changed ++ to assign, cleaned a few things