make it more explicit + cleanup
Merge pull request #1 from phoet/master

Lists Controller and spec review