modify some anti-patterns

- from http://rbtnn.hateblo.jp/entry/2014/11/30/174749
Merge branch 'master' of github.com:ciela/dotfiles