Adding comments and asserts