Some clean up and notes