Interim commit to cover minor refactorings and bug fixing