Some more comments and clean up