Added comments
Restructured Reporters class
Support nested steps