Some clean up and info