Added another cleaned function