Ooops. forget commit expand
Rakefile codestyle updates