Minor refactoring
Updates