My code became cleaner