CleanUp + added Rakefile