Refactoring Code #2

Hello, indexzero

I checked all of refactoring codes, and it changed some more stuff.
Also I tested with npm test command.
If it still not satisfied your style guide requirement, could you please answer for me?

Thanks :)

![2014-12-08 9 08 53](https://cloud.githubusercontent.com/assets/1798916/5339028/72f73eba-7f1e-11e4-9680-9ba1b09b0a8b.png)