Some more comments and cleanup