Fix my name and clean up rake tasks