Make template more readable

* $value -> $container
* Use _ for unused variables