Added comments to prepare for refactoring