Make facets more accurate
Code clean up

https://www.pivotaltracker.com/story/show/71915312