Cleaned up Rakefile by using rake file tasks