Added some comments, statement.h refactor