// Cleaned code