Adding comments and assertions for context