Remove take function
Extract constatnt / Remove do