Adding comments to framework, also using proper name conventions instead of abbreviations