* refactored rake tasks