A few more comments and cleanup