Simplified Rakefile
Further revisions for Rakefile