Snippet dialog refactored
House keeping