Cleanup code in fluid theme.
Into account the wishes of #99#discussion_r3040225
Merge pull request #99 from sergeyklay/fluid

Cleanup code in fluid theme.