Correct. You added and subtracted the like terms correctly. Your answer reflects that the $\displaystyle{{q}}^{{2}}\usepackage{cmbright}\Huge\$ terms cancelled.