rake task improvement