Cleaned code -DV