Add crossCheck function, clean up objects, min refactor