Cleaned up rake task