Some clean up and update