Dev. filtering: stremline and add comments

Compiles, not tested
Dev. filtering: add and pass test

Need to check for devices from different platforms