act code formatting
refactoring
fix rakefile
rafactoring