Cleaned up and moved uniquizing to a better position