small changes

changed so it somewhat follows the order of operations, it may not make a difference