Adding comments and removing exception