Cleanup + better constraints