Little-bit of house-keeping
- Variable name-changes, internally
- App operation separated from framework

Signed-off-by: Soumya Deb <debloper@gmail.com>