Rails4

some revise