Minor code refactoring
Updates for presentation