Remove some redundants signals, fix order of operations for x and y value computation