Some clean up, like proper references