Cleaned up variables, found bug with displaying filtered MAC's when loaded from pickel
Merge branch 'cleanup' into development