actioned review comments (github.com/jdevera)

 * use local variable in filter expression (filter());
 * moved comments regarding future changes to the bottom of the file;