Fix some copy paste typos
Clean up use statements
Pull up duplicated constraint logic to parent class