Various refactoring changes to be reviewed in next Skype meeting