Rework rakfile a little more