Further clean up and update